From b945808fc033f4164dd549349c3681b2bea017e0 Mon Sep 17 00:00:00 2001 From: justbur Date: Tue, 21 Jul 2015 10:11:34 -0400 Subject: [PATCH] Fix readme --- README.org | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.org b/README.org index 5ece31c1457..fa85454185a 100644 --- a/README.org +++ b/README.org @@ -1,10 +1,5 @@ -<<<<<<< HEAD -[[http://melpa.org/packages/which-key-badge.svg]] -* which-key -======= * which-key [[http://melpa.org/#/which-key][http://melpa.org/packages/which-key-badge.svg]] ->>>>>>> master ** Introduction =which-key= is a minor mode for Emacs that displays the keybindings following your currently entered incomplete command (a prefix) in a popup. For example, after enabling the minor mode -- 2.30.2